Merge "Fix screen size with compatibility override scale" into sc-dev