Merge "Two cleanups in People UI"