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