Merge "Reset message area." into tm-qpr-dev