Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev