Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2