Merge "Honey I shrunk the navigation bar" into lmp-mr1-dev