Merge "Fix SaveUi to properly resolve for instant apps."