Merge "Make close button to use google symbol library icon and update close color button" into main