Merge "DisplayManager : adding plugins support" into main