Merge commit 'e1df8224' into eclair * commit 'e1df8224': Remove flaky test LifecycleTest.testDialog from large continuous suite.