Merge "Restrict DisplayArea appBounds to the override bounds" into sc-dev