Merge "Replace access to mAppTokens with AppTokenIterator"