Merge "[DO NOT MERGE] fpService#authWithPrompt uses correct user handle." into sc-dev