Merge "Ensuring that the dock state is opposite of the nav bar." into nyc-mr1-dev am: 96e80573e0
am: 0a0238a1ff

Change-Id: I57a03e8a5f12ecbf09d1ed798e1fb9f2d6acbf2d