Merge "ITS: sc-dev scene3 headers for gerrit <--> g3" into sc-dev