Merge "limit mediaserver memory" into mnc-dev