Merge "Revert "Set default SMS application to Messenger"" into mnc-dev