Merge "Remove dependence on entry for app launch animations" into main