Merge "Fix inverse subhead color" into lmp-mr1-ub-dev