Merge "Don\'t change screen on time on time changes" into mnc-dr1.5-dev am: c46f6db46e
am: 9548f85d9d

* commit '9548f85d9dc4207c3d1a3eed51f98131f8210c5f':
  Don't change screen on time on time changes