Merge "Move foreground drawable down from FrameLayout into View"