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