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

Change-Id: I4a39426e17c2b6ea16cce5234f9dbed3a53cc3bc