Merge "Prevent full wake lock from keeping device awake while dreaming." into jb-mr1-dev