Merge "When adding an apptoken skip over removed ones." into lmp-dev