Merge "Revert "Mitigate the app visibility gap""