Merge "Merge "Reset message area." into tm-qpr-dev am: 796e1c4c37 am: 5a10a78ec1"