Merge "Handle location enabled setting null value"