Merge "Fix ANR"