Merge "Add a helper class for listening to subscription and airplane mode changes"