Merge "Never show transient navigation bar when empty" into nyc-mr1-dev