Merge "Avoid deadlock by broadcasting outside lock." into mnc-dev