Merge "Add flag to hide disabled keyguard options."