Merge "Broaden support for title/branding." into lmp-mr1-ub-dev