Merge "Fix loop in SF flushTransactionQueues" into qt-dev am: 3f8312b5dc
am: 6ba039f77d

Change-Id: I9ab353c172240fae42f4754cda8856fd30c44f0e