Merge "Listen to DisplayManager to get screen on/off states." into main