Merge "Follow preferences padding changes in framework."