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

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