Fixed status message alignment

Change-Id: Ie279d7853f4e4db86dddcffdfaaf1d1f023098a4
(cherry picked from commit 43bf761da2599fc6d447ac8be5bd57280986d31f)
Merge "Fixed status message alignment" into havana