Merge "Revert^2 "Fix cts testMinimalSizeDocked fail when device supports multiwindow feature."" into main