Merge "Fix a crash on the lock screen wallet icon." into tm-dev