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