Merge "Made getOnBoardingPrefs @Nullable & avoid NPE" into tm-qpr-dev