Merge "Remove LooperMode.LEGACY usage from two test classes" into main