Merge "Address multi display nav bar crash" into rvc-dev am: 7674c6bb09

Change-Id: Ib9f80d53e4e2b0a904e5fc57cd7ef19c8e2b1a14