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

Change-Id: If7c8d92a27d96668ab4698828401bcc236086ff3