Merge "Don't change screen on time on time changes" into mnc-dr1.5-dev