Follow preferences padding changes in framework.

Change-Id: Ia83237290da035e5ee7a2e92ef56fc02838aac56
4 files changed