Merge "CE: Unit test coverage for Output::updateLayerStateFromFE()"