Merge "don't call methods doing database lock from a synchronized block"