Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into pi-dev