Merge "Bypass database operations for legacy system galleries." into rvc-qpr-dev