Merge "Fix deadlock which causing ANR"