Merge pull request #2746 from theuni/android-register-player

Android register player (reverse-merged from commit 3dacd21cf2f90d599321b7a1325d0f93333d0ad9)