Merge "Update decor LayoutParams when window is already added." into oc-dev