Merge "Fix FrameLayout padding when foreground drawable is set"