Merge "Fix a bug propagating navigation button events from ToolbarActionBar" into lmp-dev