Merge "Remove one ANR cause and add logging for another"