Merge "Clarify which buttons are software buttons." into pie-cts-dev