Merge "Call ActivityCallbacks after corresponding activity methods"