Merge "DO NOT MERGE Make nav bar button click listeners overrideable" into qt-qpr1-dev