Merge "Clean up left over prototype code in Navigation Bar" into qt-dev