Merge "Make internal actors size match TextLabel size" into devel/master