Merge "Don't collapse the panel post launch if we went back to sleep." into tm-dev