Fix incorrect alignment of Restore Defaults button in some themes

Change-Id: I11bd9fea2a900a92794c5c297846eb87265eeee7
Merge "Fix incorrect alignment of Restore Defaults button in some themes" into android-4.4
Merge remote-tracking branch 'omni/android-4.4' into android-4.4