Merge "Fixing app transition due to left-nav bar inset." into nyc-mr1-dev