Merge "Use ScrollView to include the full layout." into udc-dev