Merge "Only enable scanner entry points if the scanner activity is callable" into tm-dev