Merge "Handle the empty display information" into rvc-qpr-dev