Merge "Keeps art profile for pre-dexopt" into main