Merge "Make auto-rotate pref not reset on upgrade" into pi-dev