Merge changes Ib49af35a,Iaa20454c into ics-factoryrom

* changes:
  Stop clobbering the systemUiVisibility on navbar touch. (DO NOT MERGE)
  Fix disappearing nav icons. (DO NOT MERGE)