Merge "Handle uiMode changes" into ub-launcher3-rvc-qpr-dev