Merge "camera2: Fix swapped Face detection commands." into lmp-dev