Merge "Add null check in hideEnhanced4gLteSettings."