Make FramementLayout demo better... and, um actually work.

Also some other small cleanup.

Change-Id: Iaaf5d4a85113b4a01a4bd3986e2334972e1096ad
5 files changed