Merge "Don't null the reference to Bitmap pixels until we're really ready" into jb-mr1-dev