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

* commit '53e2c6ec87e6969b5f0db2ab92a9fa133317bd29':
  [ActivityManager] Fix activity always visible.