Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev