Merge "Fix to do not use GetCurrentSize in actor-sizer" into devel/master