Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev