Merge "Use Actor target size for default layout." into devel/master