Merge "Fix title bar showing when not required." into lmp-mr1-dev