Merge "Fix a potential NullPointerException in InsetsPolicy" into rvc-dev