Merge "MediaCas : replace getService() with waitForDeclaredService()" into main