Merge "Fixed a bug where the empty shade and dismiss views would animate" into...
Merge "Fixed a bug where the empty shade and dismiss views would animate" into lmp-mr1-dev automerge: 372eb38c
automerge: 7988ef9c
* commit '7988ef9c':
Fixed a bug where the empty shade and dismiss views would animate