Merge "Abort earlier when icons are hidden"