am 48d58aad: (-s ours) am 77d5b914: Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev

* commit '48d58aad651b1c99c6d6e430142941e76fc06d37':