Merge "Fix system crash due to mismatching begin/finishBroadcast()" into nyc-mr1-dev