Merge "Switch cast over to support library dialog" into oc-dev am: de8cd0e8f5
am: 4209e9d739

Change-Id: I5311fff98a4735bf79c1f147e5733c38caf9da37