Merge "Revert Keyguard teamfood flags"