Merge "Mediaserver memory increase after record"