Merge "Remove the toast null pointer checker"