Issue 1609: Fix sync issue with multiple users on android 4.2