Merge "Remove gap between screenIds when restoring from single display device" into sc-v2-dev