Mms: Allow text input field to expand up to 9 lines for long SMS messages

Change-Id: Ia0f3317aff48fc80ed748f36183e1186e2ee2b1a
Add filtering by SIM for mms conversations (2/2)

Change-Id: Id1f0ce0ec944753fba9c93f0a2cd8112cc31eb10
Merge branch 'remote' into mkl