Merge "Fix linear layout size issue" into devel/master