Merge \"Never show transient navigation bar when empty\" into nyc-mr1-dev
am: 6da6657858

Change-Id: Ice30e61695cca73a87e67e1a06b4547305b835fc