Merge "detect tab reuse" into froyo