Merge "Reorganize ActiveGestureLogs for ease-of-use" into tm-qpr-dev