Merge changes I90d871bb,If284f43c into tm-qpr-dev

* changes:
  UserSwitcher in Compose.
  	Adds Compose buttons.