Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce