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