Merge "Fix NPE from using DeviceLockedInputConsumer after the surface has been released" into tm-qpr-dev