Angyungjebi,
I did switch some that were held in my trading account but if I trade within my investment account then that account could become a trading account too and different tax rules apply, it is a complicated arrangement. It is not just the ADI holding that would be affected.
I also believe it is time to stand up against this sort of opportunistic takeover regardless.