Merge "Fix WindowInsetsController lifecycle" into rvc-dev am: 13fa025773 am: 4bc09de93d

Change-Id: I7a7a2227548fe67b27d4b6f1554277447456e1a7