Twelve: Cleanup (yet again) the layouts

This should fix the RecyclerViews

Change-Id: Ib9ec4c51ee4fc2677da9eca056076b4f9494a71a
15 files changed