Merge "Address multi display nav bar crash" into rvc-dev