Merge changes Ie7aaec55,I3053cdb6 into sc-v2-dev

* changes:
  Remove BUBBLE_EXPANDED state from ScrimController
  Manage menu changes