Merge "Update time when turning on screen, in addition to waking up" into mnc-dev