Merge "mm-video: port heap mask change to ion."