Merge "Avoid visibility change on navBar view if null" into rvc-dev