Merge "Merge "Shorter sensor debounce" into qt-r1-dev am: 1e5890d261" into qt-r1-dev-plus-aosp