Merge "Fix destroyLayer() usage of std::remove_if" into sc-dev