Merge "A11y bug fixes for editor" into ub-contactsdialer-h-dev am: eafc179800
am: 93f878f887

Change-Id: I1a23aaa2381b93ced0cd6d1c0be5cc8c0870d333