Merge "Clean up left over prototype code in Navigation Bar" into qt-dev
am: 6db82f8965

Change-Id: I5e0a9ddb6fbaaf4bf61e43335ad24b01070bf19f