Merge "Make sure setting switch bar state is announced." into nyc-mr1-dev am: e954b992d8 am: caa37ab1db
am: bab8a2587b

Change-Id: I0709fe767ec6629904381468a047b693b9290fbb