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

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