[master 1/4] Make StorageSpoke's on_back_clicked less complicated