Merge "Hide Media*2 APIs" into pi-dev