Merge "MediaHierarchyManager: prevent crash when previousLocation is -1" into tm-dev