Merge "Changes documention for how input buttons should be labelled"