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

Change-Id: Id01df942a1f89096f30b71fb5636b615d4aa8ee3