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

* commit '8d0c7cd9439e89b348787442bf6eee0090011693':
  Fix crash when starring the user's profile