Merge "Up the sms/mms recycler limits" into klp-dev