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