TRDS 3.0 & new theme engine preparation [4/5]

Change-Id: I1fbb63d5e39cd736700a273bcb4cb6f0c62affbb
Merge "TRDS 3.0 & new theme engine preparation [4/5]" into du44