Merge "Remove warning message when enabling a serive and enable new services"