Merge "Decouple package manager lock and bitmap decoding"