Merge "Fix split layout didn't update config when rotation" into udc-qpr-dev