Merge "Fix uses_libs properties for Gallery2." into main