Merge "Check status of mEdgeBackGestureHandler to prevent NPE" into main