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