Merge "Allow non-resizable apps in split-screen (2/n)"