Merge "Use normal button style for Clear data / cache buttons" into nyc-dev