Merge "Revert "Fix exception handling in getState() binder cache"" into rvc-dev