Merge "Update decor LayoutParams when window is already added." into oc-dev am: 9c80a16c45
am: da9546bebb

Change-Id: I1b47992388556858126ed6cb5fb80ed6cd69cae4