am 2f35281a: Merge "Fix 5485925: Fix crash in transport control view" into ics-mr0

* commit '2f35281ae0ae4471527e9286f022cb960384044e':
  Fix 5485925: Fix crash in transport control view