Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev
am: 32d16291de

Change-Id: I1e37f368a64f2a0abeab0e0141e20b6ae98b5b9d