Merge "Layout fixes" into tizen