Merge "Fix shouldControlUnlockedScreenOff." into tm-dev