Merge "Fine tune Caption size and style preview height for tablet" into tm-dev