Merge "Make navigation bar always slippery" into nyc-mr1-dev
am: b5359a0ccf

* commit 'b5359a0ccf990d3befb0dfa5fa5fe5162a03aac8':
  Make navigation bar always slippery

Change-Id: I527426fc2005b29489261c3d277cff008858bd37