am 17e0eebd: am 465cb53b: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

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