Merge "Only change the resize policy to fixed if we haven't set the resize policy...