Merge "Another setting.pkg null check" into rvc-dev