Merge "Do not show media icon on AOD for active stream"