Will file an issue against settings screen done and it won't switch back to original usage screen later as blocker of this commit.
Also, I will modify this to be checking for both settings and main screen later in case they get a fix