Merge pull request #7306 from zackhow/touch-button-placement Android: Add default touch button overlay