Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev