Merge "Cleanup appop/permissions state on sms kill switch toggle"