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

Change-Id: If5eb2bc5502b704547a5ce58e1f83cfb682be63f