Merge "Revert "Show check mark when none is primary in photo picker"" into ub-contactsdialer-b-dev am: b1c2c2ca79 am: e1c960e87c am: 0bdd415
am: 568bba3

* commit '568bba38b6ec86d7ffdbca3778a373942bebbcd1':