Minor tweaks to watch ui.xml files

Change-Id: I9448eed41e43c4fce575b7ed12b5270a1d75f99b
Merge remote branch 'omni/android-4.4' into android-4.4