Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev