Merge "Remove unused windowAttributes"