Merge "Fix service binding for singleUser services" into jb-mr1-dev