Merge "Use context for user when calling notifyAsUser" into lmp-dev