Merge "Fix issue: Disable soft ap when test activity is created.            Add timer for soft ap enalbing timer: 6192139" into jb-dev