Merge "Fix icon flash on app launch" into main