Merge "camera2-portability: Fix and document obscure state machine bug" into lmp-dev