Merge pull request #8497 from OatmealDome/touchscreen-decoupling InputCommon: Decouple ButtonManager and Touchscreen from Android
