Merge "Ensure picture isn't recording in createBitmap" into pi-dev