Merge "Add primaryContentAlpha attribute"