Merge "Avoid drawing the first frame in launcher before animation completes"