Merge "Fix scrolling position not kept in Trusted Credentials" into tm-dev