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

Change-Id: If964e798cf39c03cb6d2232d103dbd7bf4941d5a