Merge "camera2: Add passive unfocused state to AF state machine" into klp-dev