Merge pull request #195 from bgcngm/master

HW Key Actions: Preference screen arrangement
Prevent SystemUI from crashing on some Xperia devices