Merge "Camera2: Allow captures right after abort" into lmp-dev