Merge "Fix centering in FrameLayout when margins are specified."