Merge "Respect "power button instantly locks" setting for dream behavior." into tm-qpr-dev