Merge "Remove pid check in register/unregister" into jb-mr2-dev