Merge "Track started and initialized states separately"