am 58fc8db6: Merge "Fixed a bug where the empty shade and dismiss views would animate" into lmp-mr1-dev automerge: 372eb38 automerge: 7988ef9

* commit '58fc8db68e73e853f74c281cf4ea048dfdd1e745':
  Fixed a bug where the empty shade and dismiss views would animate