Merge "Revert "Add unit test for StatusBarTouchController.java"" into main