Merge "Removing ENABLE_CACHED_WIDGET since we now have always listenign widget" into main