[#83544614] optimize activities view for better performance
[#83544614] fix conflict