Merge "Update Reject with Text Message path to only use default sms app." into klp-dev