Merge "Null out gainmaps on inBitmap re-use" into udc-dev