Merge "[automerger skipped] Merge "Do not go to dream on power button press when screen is off." into tm-qpr-dev am: 20e330dc28 am: 5e3e0d6206 -s ours"