Merge "New edge_back_gesture_handler_thread flag" into main