Merge "Merge "Fixes the issue multi-touch causing launcher icons to be not clickable." into rvc-dev am: 94df0317 am: fed46df3" into rvc-d1-dev-plus-aosp