Fixed some issues in activity-start on boot/ start stop service