Merge "Remove nested repeatOnLifecycle calls" into udc-qpr-dev