Merge "Fix NPE of touch handling in StatusBarTouchController#onControllerInterceptTouchEvent" into main