* commit '0385dc8d12088d98ab76de86db4cd8e1ffa34af7': Change how Java Bitmaps are accessed in a few places