Merge "Add escrow token support to synthetic password flow"