merge SwipeBackLayout changes