am 1ba310ca: am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

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