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