code reformatting
Android: fix notifications
Merge branch 'master' into androidui