Merge "Trim navigation bar buttons" into lmp-mr1-dev