Merge "Unregister mShowWeatherObserver when KeyguardClockSwitchController is detached" into udc-qpr-dev