Merge "Fixing ConcurrentModificationException in FirstScreenBroadcast" into tm-dev