Merge "Reset the static preloaded icon result once launcher is hidden" into udc-dev