Merge "Convert ProfileSelectDialog to androidx verison"