Merge "Add multi-display support to shell transitions" into sc-v2-dev