Merge "Prevent clearing home between display size changes." into sc-v2-dev