Merge "Enable FgThread and ServiceThread on ravenwood" into main