Merge "Add TestApi to reset locked modifier state" into main