Merge "Do not go to dream on power button press when screen is off." into tm-qpr-dev