Merge "Fix DisplayManager race condition when state is unknown" into tm-qpr-dev