Merge "Fix default gravity value for FrameLayout.LayoutParams" into nyc-dev