Merge "CDD: Relaxing the Media UI requirement to present MediaBrowser hierarchy." into pi-dev