Merge "Use getTitle() for AccessPoint display name"