Merge "PIN landscape updates for larger display setting" into sc-dev