Merge "Revert "MediaProjection captures DisplayArea"" into sc-v2-dev