Merge "Add null checks to removing AppTimeLimit observers"