Merge "Separate fillsParent from deciding orientation" into tm-dev