am 4cd3e47e: Merge "Issues with messaging apps on non-primary user account" into lmp-mr1-dev

* commit '4cd3e47e584fb1508db8f0e559f1167ab07c68c3':
  Issues with messaging apps on non-primary user account