Merge "Use username from notedb in serviceuser.db" into stable-3.1