am 05d20c0c: Improve 2237074: Make preview start earlier.

Merge commit '05d20c0c53cdb3a0381f03b160a840f84d42deef' into eclair-mr2

* commit '05d20c0c53cdb3a0381f03b160a840f84d42deef':
  Improve 2237074: Make preview start earlier.