automerge: 7988ef9 * commit '7988ef9c4da50f007fde71a121f89e6b9796c69e': Fixed a bug where the empty shade and dismiss views would animate
automerge: 7988ef9 * commit '7988ef9c4da50f007fde71a121f89e6b9796c69e': Fixed a bug where the empty shade and dismiss views would animate