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

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