More work on modal field editors

Bug:2680726
Change-Id: I6685fd6d20358bc2f83b2b81294106e86db0fcee
7 files changed