Merge "Make sure setting switch bar state is announced." into nyc-mr1-dev