Merge "Add enable_angle_allow_list flag" into main