Merge "Use compat framework to guard bundling LaunchActivityItem" into main