Merge "limit mediaserver memory" into lmp-dev