Merge "Fix background colors to point directly to theme attribute" into lmp-dev