Merge "Fixed SVACE errors in Test Graphics & EglGraphicsController" into devel/master