Merge "Disable lift-to-wake when always-on is checked" into oc-dr1-dev