Merge "Handle maximizing non-resizable activities in desktop mode" into main