Merge "Revert sms appops to their original defaults"