Merge changes Id49d4178,If55855ee into main

* changes:
  Add double tap divider swap functionality to flex split infra
  Add flex support for shortcut and intent entry points