Merge "Ensuring that the dock state is opposite of the nav bar." into nyc-mr1-dev