Merge "Modified Layout direction property" into devel/master