Merge "Revert "Unify logic to check if either Keygaurd or AOD are showing.""