Merge "Fix the endless panel loading" into rvc-qpr-dev