Merge "Set size compat UI to max layer" into sc-dev