Merge "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE" into tm-dev