Merge "Remove redundant setting of layer stack."