Merge "Fix crash when creating a HW Bitmap on a detached view" into oc-mr1-dev