Merge "Ensuring that the dock state is opposite of the nav bar." into nyc-mr1-dev
am: 96e80573e0
Change-Id: I299117740dfcc021a0fb8e1cee0630f545447ba3
This commit is contained in:
am: 96e80573e0
Change-Id: I299117740dfcc021a0fb8e1cee0630f545447ba3