Merge "DO NOT MERGE ANYWHERE: Don\'t change screen on time on time changes" into mnc-dr-dev am: 3e439db8c8  -s ours am: 83fd156e21  -s ours
am: 5c918ee029  -s ours

* commit '5c918ee029276efe090e82086fd4089d7686e60f':
  DO NOT MERGE ANYWHERE: Don't change screen on time on time changes