Merge "Removed warnings in DynamicLayout" into honeycomb