[MERGE] merged framework changes to branch

Hello,

- Merged framework changes to Messaging app

Thanks,
SLA