Merge "Fix 5479823: black patch was showing before resuming call" into ics-mr0