Merge "Add Listeners to PlatformCompat"