Merge "Remove font size & screen size setup flow instance" into tm-dev