Merge "Remove Account selection dialog because it will no longer exist" into lmp-dev