Merge "Restore KeyguardBottomAreaView state"