am 256599eb: Merge "Broaden support for title/branding." into lmp-mr1-ub-dev

* commit '256599eb902ae2fa7a7b2f6c0e441aed321bedf2':
  Broaden support for title/branding.