Merge "Fix the Int value to reflect shared preferences value in TouchInteractionService." into main