Merge "Fix preference screen padding for legacy apps (non Holo)."