Merge "Remove connecting Layout Child order with Actor child order" into devel/master