Merge "Update display logic for no shared data." into rvc-dev