Merge "Revert "Revert "Fix shouldControlUnlockedScreenOff.""" into tm-dev