am 2051bded: am 53e2c6ec: am c0c8d198: Merge "[ActivityManager] Fix activity always visible."

* commit '2051bded279f2d81e89b2a3731d1ba164ff9054a':
  [ActivityManager] Fix activity always visible.