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