Merge "Fix potential thread violation in applying gainmaps" into udc-qpr-dev