Merge "Combine icon app tests to allow overriding flag for new icon app chip menu testing as well." into main