Merge "Fix focus rings for buttons"