Merge "Keeping window service and permissions service in cache" into main