Merge "Make KeyguardBouncer react to device config changes." into sc-dev