Merge "Remove stateIn from buttons in shortcuts combined view model" into main