Merge proposals dependent on lp://staging/~renatofilho/indicator-messages/phablet-fix-1181371

1. phablet-fix-1181371
2. Dependent merge proposals