Merge "Camera2: fix face still display after unmark the face detect option"