am 2ee9e11b: Merge "Fix crash when starring the user\'s profile" into klp-dev

* commit '2ee9e11b58235cb7fb5840b7d744afd59f79fd59':
  Fix crash when starring the user's profile