Merge "Remove insets before calculating bounds" into rvc-dev