Merge "Fix an ANR caused by the dream overlay status bar." into tm-dev