Merge changes from topic "caitlinshk-wifi-flag" into udc-qpr-dev

* changes:
  [Flags][SB] Remove NEW_STATUS_BAR_WIFI flags.
  [Flags][SB] Remove BATTERY_SHIELD_ICON flag; use the resource directly.