Merge "Fixes getLastResponseIndexLocked() always return last index" into rvc-dev