Merge "Block incoming SMS if SMS is not supported." into main