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

* commit '3e439db8c829023645a54eee4cd531928bccb03d':
  DO NOT MERGE ANYWHERE: Don't change screen on time on time changes