Merge "Fix the issue of chips row disappears after rotate the device"