Merge "Clear bitmap references from display lists as early as possible Bug #6555840" into jb-dev