Merge "Camera: Use fallback key if the requested key returns null" into pi-dev