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

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