Merge "Ask profile password before unifying to prevent untrusted reset"