Merge "Remove EXTRA_USER_HANDLE from startSpaActivityForApp"