Merge "Fixed device info reporting for media player" into sc-dev