Merge "Remove unnecessary lock to save 1 allocation per TextView"