Merge "Fix bugs for background activity starts from notifications"