Merge "Removed unused variables from text layout code"