Merge "Fix bug 3259292 - Make FrameLayout respect margins without a gravity setting"