Merge "Merge "Add tracepoint for gesture navigation launching the camera" into qt-dev am: c543913a am: 36b78919" into qt-r1-dev-plus-aosp