Merge "Move media/apex to apex/media"