Merge "Fix Binder Crash due to CellInfo Timeout"