Merge "Ensure Text Controls do an up-call on-style-change & trigger a relayout" into...