Merge "Remove large gap between status message + presence icon on tablet"