Merge "fpService#authWithPrompt uses correct user handle." into sc-v2-dev