am dc8079ac: am 92ab28b1: am 278cdb36: Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev

* commit 'dc8079ac835290e5f7e721a72a9e9f60c7ae048e':
  Fix regression in launching CantAddAccountActivity for correct user