Amend: Fixed menu mix up and making sure perspective bar is on by default
Change-Id: I0c19e5fbf0f0d29cdca0f63afb33ca964a145b94
Former-commit-id: c8fcaf06d1 [formerly b91b706701] [formerly c8fcaf06d1 [formerly b91b706701] [formerly 1d3c378dde [formerly 53e42aa3925399271cc3ad4ee964476ddffc8eb6]]]
Former-commit-id: 1d3c378dde
Former-commit-id: 69abb31ee6 [formerly e05c12e246]
Former-commit-id: 0e64c796b1