Merge "Fix Live Caption does not follow caption size if caption is not enabled" into tm-dev