Merge "Fix activation issue with auto disabled sensors." into jb-mr2-dev