Allow container controls to size to deferred size controls
Merge pull request #48 from pec1985/timob-13951-3_1_X

Back port - Allow container controls to size to deferred size controls