Merge "[Ravenwood] Internal clean up, more PFD APIs, OsConstants, etc" into main