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

* commit '83fd156e2173ff65fd8afdaca1ccd20fc91a5d33':
  DO NOT MERGE ANYWHERE: Don't change screen on time on time changes