Merge "Cap resolution for pre-S apps on TV at 1080p" into sc-dev