Merge pull request #9281 from borjasalguero/ww_new_layout_implementation

Bug 860680 - [SMS][MMS] Include new layout in SMS/MMS App r=julienw(cherry picked from commit 60cdc0740438986c4fe502eb9c0822ce14248ef7)