Merge "Fixed some notification leaks"