Merge "Avoid visibility change on navBar view if null" into rvc-dev am: 8694188f am: 0460b4c1 am: 28fae013 Change-Id: I292b6059655afbc3057e0b583d11455b59ed5538