Merge \\"Fixing app transition due to left-nav bar inset.\\" into nyc-mr1-dev am: 8d90128bc9
am: 117a8ae090

Change-Id: I0109a617b58fa9f792209382ba57c0075c579f93