Merge "NullPointerException for Internet quick panel(slice) in Settings" into sc-v2-dev