Merge "Toggle orientation sensor outside of WM lock" into tm-dev