Merge "Revert "Revert "Combine icon app tests to allow overriding flag ..."" into main