Merge "camera2: Don't NPE in onStatusChanged" into klp-dev