Merge "Camera2: Fix ANR when switching camera during AF"