Revert "Mitigate the app visibility gap"

This reverts commit 51b96648.

Reason for revert: This may conflict with b/238420313, and will
                   have another CL to address the original problem.

Change-Id: Idd19907384af665ebf3dc387119d1955c99a876f