Merge "Add keyguard background scrim and protection around keyguard APIs"