Merge "Add setIconContentDescription to EntityHeaderController"