Merge "Preview quick affordances" into main