Merge "Track changes to brightness and orientation lock in Settings."