Merge "Handle manage/history button in new footer stack." into main