Merge "Move action click logging to the background" into udc-qpr-dev