Merge "Fix PIN lock pattern not respecting user settings" into tm-dev