Merge "HLS: fix live lock after missing the boat during configuration change" into lmp-mr1-dev