Merge "Ensure the requested insets state is up to date" into rvc-dev