Merge "Fix ANR due to long wait for synchronization lock"