am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

* commit 'f354d01afde602034e3d531eb7cbfe5fa5c48a21':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]