Merge "Add debugging logs for scanner and scan enabler" into tm-dev