Merge "Cleanup WIDGETS_IN_LAUNCHER_PREVIEW." into udc-dev