Merge "Use selected shape during app launch animation" into main