Merge change 24908 into eclair

* changes:
  Show icons for storage and geolocation