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

* commit 'c46f6db46ed5474fbe8312a1229b59debbbae994':
  Don't change screen on time on time changes