Merge "Revert "Revert "WindowInsetsController: Address API feedback""" into rvc-dev