Merge "Clean-up displayed-bounds" into rvc-dev