Merge "Camera2: Fix session close callback" into mnc-dev