Merge "Respect parent bounds if it can contain the override bounds" into rvc-dev