Merge "Camera2: fix Surface cast issue" into mnc-dev