Merge "Fix collapsibleTabs code cleanup: null != undefined & undefined variables...