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

Change-Id: Ia5170bac1cb32c1ce860c01ee499aab134e22ed0