Merge "Fix radio button tints" into lmp-dev