Merge "Update UI style for GLIF buttons" into nyc-mr1-dev