Merge "Fix setOnApplyWindowInsetsListener wrapping null" into mnc-ub-dev