Merge "Fix bug #4509967 (layout_gravity not always respected)"