Smarter image layout
am: 4e9c4e7466

Change-Id: Iba240ee3bbb768f258ab7bc3aa22325fd4d7992a