Merge "Strong auth timeout refactor"