Merge "Camera2: filter bad faces" into klp-dev