Merge "Allow non-resizable apps in split-screen (10/n)" into sc-dev