Fixing up widget layout to be flexible (issue 5290371)

Change-Id: I4b18140557fd5a93202b06ed571ee02b9951d046
2 files changed