Merge "Add logging to trace when force stop button is clicked"