Merge "Introduce StayAwakePreferenceController"