Merge "Improve locking in ZenModeHelper" into udc-qpr-dev