Merge "Fix the NPE in the ScreenPinningSettings"