am b6f31791: am 772c1749: am 2d804769: The apps might not have finished loading by the time we\'re doing this.  Fixes bug 2241755.

Merge commit 'b6f31791f11e591d7b12cb754d65e5c4899a18ab'

* commit 'b6f31791f11e591d7b12cb754d65e5c4899a18ab':
  The apps might not have finished loading by the time we're doing this.  Fixes bug 2241755.