[TIMOB-17166] Move constants definition out of ifdef block
[TC-4136] Cleanup proxy observer on dealloc
Merge pull request #5811 from vishalduggal/timob-17166-33X

 [TIMOB-17166] [TC-4136] (3_3_X) Code cleanup