Merge "Use displayId to determine CHANGE_ACTIVE_SCREEN" into sc-v2-dev