Merge "SF: Temporarily expose primary display id" into sc-v2-dev