Merge "DO NOT MERGE ANYWHERE: Don't change screen on time on time changes" into mnc-dr-dev