Merge "Use the green box's padding, and not the TitleBar's padding." into froyo