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

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