Merge "MediaHiearchyManager: prevent NPE in `updateTargetState()`" into tm-dev