Merge "MCV2: Add contentDescriptions to buttons" into pi-dev