Merge "Add alignment support in LinearLayout." into devel/master