Fix sync issue with multiple users on android 4.2 (issue 1609)