Merge "Create static inner class for UiModeManager" into udc-qpr-dev