Merge "ENABLE_WIDGET_PICKER_DEPTH" into tm-qpr-dev