Merge "Remove unused HWCLayer::setPerFrameDefaultState()"