Merge "Virtual input API improvements" into main