am 7b5a7434: am 288d32b9: (-s ours) am 17e0eebd: am 465cb53b: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

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