Merge "Camera2: Improve ANativeWindow handling"