Merge "Merge "MediaHierarchyManager: prevent crash when previousLocation is -1" into tm-dev am: 9f4def912b am: b82f11fc0c"