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

Change-Id: I48fab637fb74f94eb8e747bc38208f8f07880ad6