Merge "Merge "Fix potential thread violation in applying gainmaps" into udc-qpr-dev am: 7e9773de36 am: d93edc76fb" into main