Merge "Fix 5380695 Lockscreen transport control must reflect error state" into ics-mr0