Patch By: hanya Review By: jsc (cherry picked from commit aa098b9e) Conflicts: include/toolkit/controls/controlmodelcontainerbase.hxx Change-Id: I4c038c08d24ceceba606154573abbb1cd41cf7cb