Merge "Fix for mic dislosure indicator getting stuck"