* commit '1d8aae3b1924b2340250bdffe491819a26eea5fe': Change how Java Bitmaps are accessed in a few places