Merge "Remove car activity resolver framework references" into main