add UIApplicationDidBecomeActiveNotification
merge