Merge from SwipeBackLayout