Merge "Add dump of current nav bar layout" into rvc-dev