Merge "Revert "MediaBrowser: Add the "Compat" postfix"" into mnc-ub-dev