Merge "Reduce the direct access to mCurTokenDisplayId in IMMS" into main