Merge "Templatized BasicMediaRouter - Base Template" into developers-dev