Introduces some new, more composable base components in an effort
to reduce synthetic "editing" states and have a more natural focus
change response.

Change-Id: I35a51f93ad6f92c0154fd0c40e944af6f54cbba2