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