The previous fix only works around the issue when it is detected. This may require re-entering the room once when it gets stuck. If we ensure proper linking from the beginning, hopefully we don't run into any issues at all. Change-Id: Idf0f1882ec4f197f58f3818e63386a4def838b25