Merge "Workaround for stingray crash due to using old bitmaps. (Bug: 5397469)"