Merge "DO NOT MERGE limit mediaserver memory" into klp-dev