Merge "Move setHasTopUi to the background" into udc-qpr-dev