Merge "DO NOT MERGE ANYWHERE: Don\'t change screen on time on time changes"...
Merge "DO NOT MERGE ANYWHERE: Don\'t change screen on time on time changes" into mnc-dr-dev am: 3e439db8 -s ours am: 83fd156e -s ours
am: 5c918ee0 -s ours
* commit '5c918ee0':
DO NOT MERGE ANYWHERE: Don't change screen on time on time changes