Merge "Add developer option for sms access kill switch"