Merge "Make ZenModeControllerImpl more robust" into udc-qpr-dev