Merge "Revert "Remove FlickerService tests"" into main