Merge changes I500c566e,I4b5ffc26 into sc-v2-dev

* changes:
  Update the flyout width to be smaller on large screens
  Updates to manage button based on latest mocks